From 1a422a68320c6c5449bfee0f28a8da0a65697168 Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Sun, 21 Nov 2021 14:04:03 -0700
Subject: [PATCH] improve string handling, fix 9 year old FIXME. (#769)

---
 igc.cc | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/igc.cc b/igc.cc
index faa3065ba..e17e9beab 100644
--- a/igc.cc
+++ b/igc.cc
@@ -593,8 +593,6 @@ static void wr_header()
   const route_head* track;
   struct tm* tm;
   time_t date;
-  static const char dflt_str[] = "Unknown";
-  const char* str = nullptr;
 
   get_tracks(&pres_track, &track);
   if (!track && pres_track) {
@@ -611,28 +609,27 @@ static void wr_header()
 
   // Other header data may have been stored in track description
   if (track && track->rte_desc.startsWith(HDRMAGIC)) {
-    char *rd = xstrdup(track->rte_desc);
-    for (str = strtok(rd + strlen(HDRMAGIC) + strlen(HDRDELIM), HDRDELIM);
-         str; str = strtok(nullptr, HDRDELIM)) {
-      gbfprintf(file_out, "%s\r\n", str);
+    QString desc = track->rte_desc.mid(QString(HDRMAGIC).size());
+#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
+    const QStringList fields = desc.split(HDRDELIM, QString::SkipEmptyParts);
+#else
+    const QStringList fields = desc.split(HDRDELIM, Qt::SkipEmptyParts);
+#endif
+    for (const auto& field : fields) {
+      gbfprintf(file_out, "%s\r\n", CSTR(field));
     }
-    xfree(rd);
-    rd = nullptr;
   } else {
-// FIXME: This almost certainly introduces a memory leak because str
-// is a c string that's used for totally too many things.  Just let it
-// leak for now. 2013-12-31 robertl
-    if (const Waypoint* wpt = find_waypt_by_name("PILOT"); (nullptr != wpt) && !wpt->description.isEmpty()) {
-      xfree(str);
-      str = xstrdup(CSTRc(wpt->description));
+    // IGC header info not found so synthesise it.
+    QString pilot;
+    // If a waypoint is supplied with a short name of "PILOT", use
+    // its description as the pilot's name in the header.
+    const Waypoint* wpt = find_waypt_by_name("PILOT");
+    if ((nullptr != wpt) && !wpt->description.isEmpty()) {
+      pilot = wpt->description;
     } else {
-      // IGC header info not found so synthesise it.
-      // If a waypoint is supplied with a short name of "PILOT", use
-      // its description as the pilot's name in the header.
-      str = xstrdup(dflt_str);
+      pilot = "Unknown";
     }
-    gbfprintf(file_out, "HFPLTPILOT:%s\r\n", str);
-    xfree(str);
+    gbfprintf(file_out, "HFPLTPILOT:%s\r\n", CSTRc(pilot));
   }
 }
 
-- 
2.30.2